drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
183,065 Commits 1 Branch 0 Tags
Commit Graph

9757 Commits

Author SHA1 Message Date
Andre Eisenbach
a1a6c300af Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 2014-12-02 08:02:02 +00:00
Cheuksan Wang
b72eb97e4b new SMS/MMS carrier app API 
Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
 2014-12-01 18:11:07 -08:00
Shishir Agrawal
688b107330 am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:36:12 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean. 
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
 2014-12-01 11:48:53 -08:00
Andre Eisenbach
16bf846990 Add server-side callback for change in MTU (4/4) 
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.

Bug: 18388114
Change-Id: I515bfc2cc9846490d57de71860f41ea9a61fa243
 2014-11-26 12:58:44 -08:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Adam Lesinski
e1d149d5da am 44a711cc: am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '44a711ccac480aef4e8518284b8a0320e227f2df':
  Make the Context service constant for UsageStats public
 2014-11-25 18:50:57 +00:00
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Dianne Hackborn
475615b583 am 14dd6ebf: am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '14dd6ebff64af8d991680b7dda2286cd1d578c06':
  Final resource IDs.
 2014-11-25 17:48:30 +00:00
Sreeram Ramachandran
b3e20899fe am 19f47022: am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '19f47022e0c89a11ef03c158d19fa294168da360':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:16:05 +00:00
Adam Lesinski
aa6076701d Make the Context service constant for UsageStats public 
This was an oversight in L, where we did not make this
service constant public.

Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
 2014-11-24 13:53:57 -08:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs. 
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
 2014-11-24 12:13:11 -08:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Eino-Ville Talvala
a48e26bb65 am bd9567e1: am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'bd9567e1569a6fc5222427f18cc653c29c0beb89':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:12:51 +00:00
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Dianne Hackborn
b2411f77ca Final resource IDs. 
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
 2014-11-21 17:04:53 -08:00
Bryce Lee
2388c814a0 am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit '296ea9174222e64085a66a238e6df13b8b378b1e':
  Make default windows features configurable.
 2014-11-21 22:33:01 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Sreeram Ramachandran
c2c0beab79 Allow VPNs to specify their underlying networks. 
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
 2014-11-21 09:26:18 -08:00
Dianne Hackborn
caff64dfe7 am 676b1d88: am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b 
* commit '676b1d886c95a2481dc377a9c2a6e045f08326e0':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 12:18:15 +00:00
Alan Viverette
2c44d8ab1f am ea28d459: am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev automerge: 9eb4ee24 
* commit 'ea28d4594d24c118def2f16ee98b771d5e704f69':
  Make DeviceDefault alert dialog themes public
 2014-11-21 12:18:00 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Wink Saville
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Shishir Agrawal
3e8a9053dc am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
automerge: 84b988e

* commit '84b988e6eea690c33e5f08b3a7f41d3a8cd8d912':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 01:47:25 +00:00
Dianne Hackborn
28096c49d8 Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev 2014-11-21 01:31:10 +00:00
Dianne Hackborn
24b1c23c62 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION 
You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
 2014-11-20 17:17:39 -08:00
Alan Viverette
e0a377f509 Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 2014-11-21 00:08:25 +00:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
Eino-Ville Talvala
6aee1d2ba5 Camera: Add new capability flags as system features as well 
Also add all the L and L MR1 new system features to the uses-feature documentation.

Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
 2014-11-20 15:52:40 -08:00
Alan Viverette
8513453e37 Make DeviceDefault alert dialog themes public 
BUG: 18426645
Change-Id: Icd93dd4b153285e7636a59bec193b2fdf2d21da8
 2014-11-20 15:24:36 -08:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Chet Haase
ab11cfa2d3 am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8 
* commit 'a2b3a75ca599c3a2334b9c81a5abd6f544615d2f':
  Fix seeking and scaled duration behavior
 2014-11-20 21:19:27 +00:00
Alan Viverette
8c359de059 am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06 
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:19:17 +00:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Shishir Agrawal
a9b6777154 Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 2014-11-20 17:44:36 +00:00
Erik Kline
90e9307e8f Rename EXTRA_NETWORK ConnectivityManager constants. 
Per b/18414703:

    s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
    s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g

Additionally, associated string values updated to:

    android.net.extra.NETWORK
    android.net.extra.NETWORK_REQUEST

Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe
 2014-11-20 13:16:31 +09:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Chet Haase
85603a7faf Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 2014-11-20 00:02:09 +00:00
Alan Viverette
b130d5961c Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 2014-11-19 23:52:24 +00:00