Wink Saville
35152f13b3
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
2013-08-08 22:06:21 +00:00
Wink Saville
5191b85990
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
2013-08-08 22:05:20 +00:00
Wink Saville
cbad1243ad
Merge "Check that hipri has started." into jb-mr2-dev
2013-08-08 22:03:45 +00:00
Dianne Hackborn
7f09ec39b6
Fix issue #10226007 : Reset apps restores most of the changed settings...
...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
2013-08-07 15:49:02 -07:00
Wink Saville
7f6ee2ec90
Check that hipri has started.
...
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug: 9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
2013-08-07 11:02:57 -07:00
Xia Wang
4032217ee9
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
2013-08-05 22:51:03 +00:00
Wink Saville
bf34122a96
In CaptiviePortalTracker a socket timeout is probably a captive portal.
...
On a AT&T warm SIM a socket is not possible so a timeout occurs.
In CheckMp a timing out on a socket is declared as a "warm" sim,
make CaptivePortalTracker the same.
Bug: 10038362
Change-Id: Icb9fb0a1b67704dc9adf6a6348a3781fb9582a89
2013-08-05 14:17:02 -07:00
Wink Saville
42d4f08db2
Have CaptivePortalTracker use gservices updateable provisioning urls.
...
After detecting there is a captive portal the url used in the
notification for mobile networks should be updateable via gservices.
These urls will be the same as used by CheckMp and is needed for
carriers that have specific provisioning urls such as AT&T and Verizon.
Bug: 9622647
Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
2013-08-05 14:15:54 -07:00
Dianne Hackborn
607b414d04
Add new app ops method to reset all op modes.
...
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
2013-08-02 19:06:25 -07:00
Dave Burke
7925e7cc08
Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
2013-08-02 20:36:28 +00:00
Dave Burke
0997c5bd79
Revert "Add version identifier to app ops."
...
This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159.
Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
2013-08-02 20:25:02 +00:00
Sascha Prueter
d364859ce6
Merge "Add version identifier to app ops." into jb-mr2-dev
2013-08-01 20:50:02 +00:00
Dianne Hackborn
483a6bbfc1
Add version identifier to app ops.
...
All old versions drop their modes except for the notification op
(which is the only one there is currently a user-visible control for).
Change-Id: I9e09cebe63e9ea81f2adc01aef7d1a5a59f57a56
2013-08-01 11:15:04 -07:00
Daniel Sandler
9eb434c389
Allow the user to block notifications for foreground services.
...
Stepping carefully around the fix in change Idc788527, we
perform security (and AppOps, and therefore user block)
checks against the uid passed to enqueueNotificationInternal
rather than the Binder caller.
Bug: 9502541
Change-Id: I91745db92823381df75721c1b8f11013a7fa4ecc
2013-08-01 00:44:57 -04:00
Dianne Hackborn
a99cb5bc41
(DO NOT MERGE) Fix pub issue #58043 : Copy crash in Android 4.3...
...
...when clipboard listener attached
We need to clear the calling identity before dispatching change
notifications. Also make this more robust, so that in the face
of any failure we will clean up the broadcast state.
Integrated from master.
Change-Id: I05e1f76ffd486439535631fe4062dabe94bd2ccf
2013-07-31 13:48:39 -07:00
Dirk Dougherty
38d4cfd4a1
Merge "Doc change: fix reference to getBestDateTimePattern()." into jb-mr2-dev
2013-07-24 18:18:14 +00:00
Dirk Dougherty
218dd76e98
Doc change: fix reference to getBestDateTimePattern().
...
Change-Id: Iad96f4079390e3589d21402fc8e01d6446f001b3
2013-07-24 11:16:28 -07:00
Dirk Dougherty
ac6be10544
Doc change: remove devices listed for vp8 hw encoder in highlights.
...
Change-Id: I8058981fc90270abcdecd415c593a3211afe4acb
2013-07-24 10:50:47 -07:00
Dirk Dougherty
58729dd602
Merge "Doc change: update carousel on develop home." into jb-mr2-dev
2013-07-24 06:47:27 +00:00
Dirk Dougherty
9ce329d0c7
Doc change: update carousel on develop home.
...
Change-Id: Iada49cfb6ad2f13967d8e7bd72ac08d9977feb5c
2013-07-23 23:40:52 -07:00
Dirk Dougherty
144479f255
Merge "Doc change: Platform highlights for Android 4.3." into jb-mr2-dev
2013-07-24 04:48:54 +00:00
Dirk Dougherty
3ab0470cf1
Doc change: Platform highlights for Android 4.3.
...
Change-Id: If178b8268d4d703d06266cb3adc0c124e596378c
2013-07-23 21:37:56 -07:00
Scott Main
538ccd69e2
Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
2013-07-24 01:17:00 +00:00
Joe Fernandez
cd76edb929
Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
2013-07-23 22:52:14 +00:00
Joe Fernandez
b5c29e75a0
docs: OpenGL ES 3.0 dev guide update
...
Change-Id: I46b9aee4c6b31e1ac6148f79b8607292b04f69c6
2013-07-23 15:48:30 -07:00
Scott Main
2edf372ed2
fix javadoc error
...
Change-Id: Ieae3e73cda9541e774626fbd73100cdadc1513ad
2013-07-23 13:52:05 -07:00
Scott Main
9460f4072a
update usb driver doc with download link;
...
delete revision notes
Change-Id: I325137a026ea99cb2cd5d5f4689a9c1ee5942a92
2013-07-23 13:41:38 -07:00
Scott Main
3dee8aaf17
Merge "update action bar guide for support lib ABC" into jb-mr2-dev
2013-07-23 20:21:13 +00:00
Dirk Dougherty
0acf946bb4
Doc change: Add Colopl video to carousel and spotlight.
...
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:33:06 -07:00
Scott Main
e04c454302
update action bar guide for support lib ABC
...
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
2013-07-23 12:17:05 -07:00
Joe Fernandez
c4624d2efb
Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
2013-07-22 20:57:20 +00:00
Joe Fernandez
b5fff750e1
docs: Android 4.3 Platform Release Notes
...
In addition to platform notes, modified the SDK Manager update
warning to advise downloading of SDK Tools 22 or higher. This
dependency is based on the updating of the SDK repository
schema. The last update was repository-8 with the SDK 22.0.0
release, according to raphael@.
Change-Id: Icaaf39a6d49eccdc926aa4c4249db8a0b1d095a7
2013-07-22 12:54:02 -07:00
Joe Fernandez
60c4b16e28
Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
2013-07-22 16:13:20 +00:00
Joe Fernandez
bdbe56f6a8
docs: NDK r9 Release Notes
...
Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208
2013-07-19 17:04:02 -07:00
Joe Fernandez
ab00d352ff
am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
...
* commit '658374d56577a4f8864ba3c7ed8f2e425d13d997':
docs: Android SDK 22.0.4 Release Notes
2013-07-19 13:05:12 -07:00
Joe Fernandez
658374d565
am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
...
* commit '2685febd0d51bac4da755756b5348eb95c57ef73':
docs: Android SDK 22.0.4 Release Notes
2013-07-19 13:02:24 -07:00
Joe Fernandez
2685febd0d
am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
...
* commit '6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
docs: Android SDK 22.0.4 Release Notes
2013-07-19 12:59:11 -07:00
Joe Fernandez
6f75a73c04
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
2013-07-19 19:55:48 +00:00
Joe Fernandez
5b7e6a335e
docs: Android SDK 22.0.4 Release Notes
...
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
2013-07-19 11:47:00 -07:00
Robert Greenwalt
8c87b29793
Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
2013-07-19 17:10:38 +00:00
Scott Main
ca3b4e9b7e
remove significant motion
...
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
2013-07-18 16:10:37 -07:00
Scott Main
1be763494e
Merge "more details about account access in restricted profiles" into jb-mr2-dev
2013-07-18 22:46:12 +00:00
Scott Main
d3ed45f841
am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
...
* commit '991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
fix typo in code sample
2013-07-18 15:22:16 -07:00
Scott Main
991487c635
am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
...
* commit '9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
fix typo in code sample
2013-07-18 15:19:39 -07:00
Scott Main
9a1f106d9e
am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
...
* commit '34a1fa43899dc2b0b2f249262b69c922949ab626':
fix typo in code sample
2013-07-18 15:16:46 -07:00
Scott Main
34a1fa4389
Merge "fix typo in code sample" into jb-mr1.1-ub-dev
2013-07-18 22:13:56 +00:00
Scott Main
f128275bdc
more details about account access in restricted profiles
...
Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3
2013-07-18 15:09:03 -07:00
Robert Greenwalt
c13368bfd1
Make CS.isTetheringSupported dynamic
...
It used to be set at boot, but that was too quick to pick up carrier
specific resources. With this change even if you switch sims subequent
checks get the new values.
bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
2013-07-18 14:24:42 -07:00
Scott Main
d25cc954ee
fix typo in code sample
...
Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e
2013-07-18 10:18:57 -07:00
Dirk Dougherty
e0380d8fe6
resolved conflics for merge of 54201120 to jb-mr2-dev
...
Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
2013-07-17 18:44:03 -07:00